trayicon-x11: Fix warnings when visual is not available.
authorVincent Bernat <bernat@luffy.cx>
Sat, 27 Aug 2011 18:06:26 +0000 (20:06 +0200)
committerBenjamin Otte <otte@redhat.com>
Sun, 28 Aug 2011 18:20:35 +0000 (20:20 +0200)
This fixes a regression introduced in commit
b1a1685a33eca16979e63d79915395af0b36. gdk_visual_get_*_pixel_details()
should not be called with a NULL visual.

https://bugzilla.gnome.org/show_bug.cgi?id=649588

gtk/gtktrayicon-x11.c

index 9c35dafd70389116cadbb0238bed76d0ac650a85..f31b58e2db2e5671584b3240904db314396d6d49 100644 (file)
@@ -505,9 +505,12 @@ gtk_tray_icon_get_visual_property (GtkTrayIcon *icon)
       visual = gdk_x11_screen_lookup_visual (screen, visual_id);
     }
 
-  gdk_visual_get_red_pixel_details (visual, NULL, NULL, &red_prec);
-  gdk_visual_get_green_pixel_details (visual, NULL, NULL, &green_prec);
-  gdk_visual_get_blue_pixel_details (visual, NULL, NULL, &blue_prec);
+  if (visual != NULL)
+    {
+      gdk_visual_get_red_pixel_details (visual, NULL, NULL, &red_prec);
+      gdk_visual_get_green_pixel_details (visual, NULL, NULL, &green_prec);
+      gdk_visual_get_blue_pixel_details (visual, NULL, NULL, &blue_prec);
+    }
 
   icon->priv->manager_visual = visual;
   icon->priv->manager_visual_rgba = visual != NULL &&